Merge "Improve test flakiness around FGS notifications" into sc-dev