Revert "Revert "Centralized quick step/scrub/switch logic (1/2)""

This reverts commit 0e490d9208de480ed38fe31a12029fc59b0955e9.

Reason for revert: Will be merged with fix
Bug: 74726495
Test: manual

Change-Id: I36ea9c2702107b23eff4adb1f3ba9fdc1be12999
10 files changed