Merge commit '99cf71b0856e00c1ae9631db91702349cceb9bf8' * commit '99cf71b0856e00c1ae9631db91702349cceb9bf8': Fix multi-lock ordering issues in GLSurfaceView
Merge commit '99cf71b0856e00c1ae9631db91702349cceb9bf8' * commit '99cf71b0856e00c1ae9631db91702349cceb9bf8': Fix multi-lock ordering issues in GLSurfaceView