Merge "Wait until notification pop up is gone" into main