Merge "Minor cleanup in GLrenderer code"