Merge "Revert "Make RotationTouchHelper singleton to report single rotation state"" into sc-dev