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
Change-Id: I0ba276fa20965ed08efba2b83bfbc40687aa5bc3