Revert "OmniSwitch: quick switcher"

This reverts commit 1669b057e2752d8bc48841055f4c3c021e966b40.

Change-Id: I21b74630f293a5d448ebe37a1ec4b58fbdae8c96