Merge "Fix crash in BrightnessTracker write events" into sc-dev