Merge "Store volume when the active device is set to null"
am: 520389198c

Change-Id: I67eece47fde07302bd3fad70711dba0c7c32b888