Merge "Update BrightnessSynchronizer Logic" into tm-dev