Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev