Merge "Output switcher header is not updated with the latest media content"...
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c94 am: e1c3cdf6 am: 20de5d75 am: d01dc265
Change-Id: Ib0a0ceb065ad8bdd95574899e68faf4cbf158aab