Merge "Fix flickering of screen resolution change with deferred updater" into main