Merge "Fix testDisableRotationCheck"