Merge changes I515ee4ae,Ica6f8c2c into main

* changes:
  Fix AvalancheController.update NPE when HeadsUpEntry is null
  Write AvalancheController state to dumpsys