Merge "Fix testFixedOrientationWhenRotating."