Merge "Treat ACTION_CANCEL as ACTION_UP for magnification"