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

Change-Id: Ic0ceeef771a1d8f0a48dc98cda7902d53ab2fb86