Merge "Make volume dialog pick up on theme changes" into oc-dev
am: 1ec5d85a41

Change-Id: I9b2e6dbe789bb6e1ff113e5ad015813e1062c6b4