Merge "Set active volume device to null if there is no new device"
am: 0eb91d32c7

Change-Id: I636fd91530cf1ac24f5b32714c65a777903e6682