Merge "Adding support for auto-cancelling an action mode when interacting with launcher" into ub-launcher3-master