Merge "Always cancel forwarding on ACTION_UP or ACTION_CANCEL." into ub-launcher3-calgary
am: 278958e922

Change-Id: I16625087195715c1070540a9bdc9e34718225cf9