am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1

* commit '7f1c94e198e051bf481fd2d286c7b33d00664f9d':
  Fix rotation displays frame N-1 briefly while rotating