Merge commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570' * commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570': Fix egl cleanup code on context teardown.
Merge commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570' * commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570': Fix egl cleanup code on context teardown.