Revert "Revert "Merge remote-tracking branch 'upstream/master' into bubble-tea""

This reverts commit a76dc9b333ef8b24e0ea20e50116abb1914ab285.
fix app_window_manager.js
Merge pull request #16939 from gasolin/bubble-tea-fix

Revert "Revert "Merge remote-tracking branch 'upstream/master' into bubb...