Merge "Unmute the streaming as the last step of changing active device" am: 6246a298a1
am: 01996d64bc

Change-Id: I565e1dfa9fb7cbccd77c0d9c1879c7fa4a0b7368