Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1