Merge "Fix GL rendering of translucent surfaces"