Merge "Add a flag to fix rotation to user rotation only."