Merge "Add some compatibility support for resizing."