Merge "Themable volume and power dialogs" into oc-dr1-dev