Only validate avatar cropping values when avatar is present AND changed

Closes #13905

See merge request !3018