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 am: 61e1d03d
Change-Id: I25c789e70f36b64c4756ef3e1f118bdce22f3934