Merge pull request #8834 from davidflanagan/bug834773

Bug 834773 - Support image/* and type arrays in pick activity r=dkuo(cherry picked from commit e64428cae922d32fc043cca390c32473963caec6)
Merge pull request #8977 from davidflanagan/bug834773-v1-train

Merge pull request #8834 from davidflanagan/bug834773