Merge "Fix flaky test for persistent notifications" into main