Merge "Rotation lock bugfix."