Merge "Update auto-rotate UI to comply with guidelines" into sc-dev