Merge pull request #8927 from bentian/bug-852468

Bug 852468 - [Gallery/Camera] Gallery is shown deleted files after delet... r=djf(cherry picked from commit 04f9c673e9d5a03adf16cab5e1213665dea5db48)
Merge pull request #8975 from davidflanagan/bug852468-v1-train

Merge pull request #8927 from bentian/bug-852468