Merge "Output switcher header is not updated with the latest media content" into rvc-dev