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

Change-Id: I1c0bde0ca65f05a3d4ffe63c3b91eed2a8dca70f