Fix #8307 -- Saving a model with an ImageField with width_field or height_field no longer results in an extra read operation

Fix #8307 -- Saving a model with an ImageField with width_field or height_field no longer results in an extra read operation #717