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

Change-Id: Ic2ebf14efd54e62d573fd14f0f9df03e104493a2