Merge "DO NOT MERGE: HA still appears in Media device list even though it has been unpaired." into sc-v2-dev