Merge "Trigger window sensitive on notification updates" into main