Merge "Allow for resize into the same bounds" into main