Merge "Improve window content change events merging from multiple views" into main