Merge "Add quickpickup gesture" into sc-dev