Merge "Remove quick switch and simplify quickstep code for scrub" into pi-dev