Merge "emulator/opengl: Backport fixes from master branch." into idea133