Merge "enable tab switcher on phone QuickControls"