Merge "Volume UI updates" into pi-dev
am: 89c4bd5f26

Change-Id: Idcc2eb1c020b86a13de4948215b4a8311ea7fff4