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: bd59e9ad am: 50130a74 am: 8828c12e
Change-Id: Ic6f12ae824afac89dccd1f192f5e779dea42367c