Merge changes I4a87c587,If43c21bd

* changes:
  Implement brightness-aware scrim
  Clean up UdfpsController intitialization logic