Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev