Merge "Revert "Fix a bug in TouchInteractionService for fixed-display input rotation"" into sc-dev