Merge "[Output Switcher] Adjusts color, size and margin"