Merge "Volume: Shave 12dp off of the volume dialog." into lmp-dev