Merge "Centralized quick step/scrub/switch logic (1/2)" into pi-dev