Merge "Add DisplayId to BrightnessTracker" into sc-dev