Merge "Fix brightness dialog" into udc-qpr-dev