Merge "Remove extra padding on volume mute status icon" into udc-qpr-dev