Merge "suspend: De-flake suspend tests"