Merge pull request #8958 from davidflanagan/bug856908

Bug 856908 - support picks of image/* in camera and wallpaper r=dkuo(cherry picked from commit 7995b9a29b4b7ebc88be78f3da4f27adc371c802)