Merge commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323' * commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323': Improve GLSurfaceView to avoid deadlocks and race conditions.
Merge commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323' * commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323': Improve GLSurfaceView to avoid deadlocks and race conditions.