Merge "[Output Switcher] Fix recyclerview flickering" into tm-dev