Merge "Fix ScreenRotation flicker from 90 to 270." into sc-dev