Merge "Fix some rotation and tapping problems"