Merge "Fix SnapResizeAppWindowWithButtonTest" into main