Merge "Prevent sensor induced rotations while screen is touched"