Merge "DO NOT MERGE: Downbranch don't need this adjustment [Output Switcher] Keep showing the add button" into sc-v2-dev