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

Change-Id: Ie1f57d96acc0560e5a2109c746adf5daf7bd3214