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