Merge changes from topic "centralize-quick-3s" into pi-dev

* changes:
  Fixes crash on navbar using 3rd party launchers
  Revert "Revert "Centralized quick step/scrub/switch logic (1/2)""