Merge "Revert "Redesigns the volume panel!"" into sc-dev