Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev