Merge "[Output Switcher] Update device selection layout" into tm-qpr-dev