Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control" into tm-dev