Merge "[Output Switcher] Fix ArrayIndexOutOfBoundsException" into udc-dev