Merge "Improved timing of when system sends multi-window change event to app"