Merge "[Output Switcher] Follow up change of output switcher for mertial next" into sc-v2-dev