Merge "[Output Switcher] Increase MediaOutputController unit test coverage" into udc-dev