Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one" into tm-dev