Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb