Merge "Fix flaky signal tests."