Merge "Cheesy fix for flaky notification tests." into mnc-dev