Merge "Reset `mShouldClick` on ACTION_CANCEL event so click is not performed" into main