Merge "Disable smart auto rotate without using USER_CURRENT" into main