Merge "Don't trigger click if long press already happened"