Merge "Fix theme of BrightnessDialog" into udc-qpr-dev