Merge "Adjust background restriction transition delays in tests" into main