Merge "Update sprite surface when desired width or height changes." into main