MDL-44826 Atto: Image alignment options

If an image has custom alignment or margins - don't overwrite
them unless a new alignment option is chosen.