Merge "Change brightness dialog theme" into oc-dev