Merge "Prefer ES 2.0 with external image support vs ES 3.0 without that support"