Merge "Make sure set GL state properly" into ics-mr0