Merge "Fix output switcher will show wrong active device" into rvc-dev am: 8911616d84

Change-Id: I64e58c50ce098642f7f0d3892c05ddd545233ca5