Merge pull request #18246 from justindarc/bug993512

Bug 993512 - [B2G][Camera] Retaking a photo will briefly display previou... r=djf(cherry picked from commit 4ffb7c8cb330fc22cba938223443f056c7bc03b8)
Merge pull request #18251 from davidflanagan/bug993512-v1.4

Merge pull request #18246 from justindarc/bug993512