Merge "Move the volume panel over 4dp for consistency"