Merge "Don't update brightness settings when throttling brightness" into tm-dev