Merge "Making BrightnessSynchronizer operate on Display thread" into main