Merge "De-flake notification avalanche tests" into main