Merge "Revert^2 "Re-enable the tests for background restrictions"" into main