Bug 25031: (QA follow-up) Improve handling of one or fewer images