Merge "Handle conflicting image format options in predictable way."