Merge "Revert^2 "Update the BackgroundThread dependency"" into main