Merge "Avoid changing transform when touching in progress" into main