Merge "Should update surface position of the window before report resize" into main