Merge "Reduce the number of GL commands generated by the UI"