Merge "Fix brightness dialog background to be light" into oc-dev