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

Change-Id: I2e65439d8d4118839f721dec7be480658cb1e60d