Merge "Clean up VolumePanel, tweak volume & brightness dialog styling"