Merge "Simplify flicker notification tests" into main