Merge "Disable FLAG_WATCH_OUTSIDE_TOUCH for new touch detection"