Merge "Fix issue #3263026: Screen rotation animation is funky..."