Merge "Cleanup quick switch logic" into ub-launcher3-rvc-dev am: a8a377cd49

Change-Id: If9aa7f30518b8d846d1d63de7330d1dde92120b3