Merge "Fix crash in BrightnessTracker" into sc-dev