Merge "Fix snapshot window jump due to top window has another cutout mode" into main