Merge "Remove BrightnessConfiguration from BrightnessTracker" into udc-dev