Merge "Allow resizing out of invalid size" into main