Merge "Unrotate inputwindows into rotation display grew-up in" into sc-dev