Merge changes I0e61db91,Icb7ab995 into main

* changes:
  Revert "Update the BackgroundThread dependency"
  Revert "Utils required for CrashRecovery module"