Merge "emulator/opengl: Backport fixes from master branch." into idea133
 Auto-merge: 326b951

* commit '326b951d7e963873aa82065a47bd8ea150f2d225':
  emulator/opengl: Backport fixes from master branch.