Merge "[Output Switcher] Adjust device list height" into tm-dev