Merge "No media status is visible in Output Switcher" into rvc-dev am:...
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2 am: 4a82a5ab am: 1106c199 am: 774620f5 am: 0c9505da
Change-Id: I0d25df9506765123ac65c631665573c36819f01f