Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] fix checkbox not show" into tm-dev