Merge changes I7825436b,I93c97788 into main

* changes:
  Remove Udfps's BackgroundViewModel
  Cleanup unused code that is leftover