Merge "Fix theming on brightness dialog" into oc-dev