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

Change-Id: I6e53e981b3785fd8a1ea09e6ad7137e63cd548a7