Merge "Revert^3 "Enable input window rotation flag"" into sc-v2-dev