Merge "Make volume dialog pick up on theme changes" into oc-dev