Merge "Fix the issue of accessing BrightnessSetting inside a lock" into udc-dev