Merge "Separate corner resize tests into individual scenarios" into main