Merge "Clean up BrightnessSynchronizer"