Merge "[Output Swithcer] Fix deeplink and disable single device layout" into udc-dev