Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Decouple selection behavior code" into udc-dev