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