Merge "Ignore flaky notification test"