Merge "EmuGL: misc small cleanups" into ics-mr1