Merge "Update icons in the volume rocker" into oc-dr1-dev