Revert "Revert "Revert "Fix rotation issue with touchscreen"""

This reverts commit c1452df32c0edcc5c40355b0e14d3d93c47d2c17.