Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev