Merge "Simplify BrightnessSynchronizer"