Merge "Make quickPickup gesture depend on liftToWake" into sc-v2-dev