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: dab41862
Change-Id: I66cd127231cec22ae96f18b763bc96961b3d4c9b