Merge pull request #7991 from daleharvey/handle-camera-errors

Bug 838639 - Add an error handler when we fail to take a picture(cherry picked from commit 04a78898293bfb943f103874040b587a1026ff19)
Merge pull request #9853 from davidflanagan/bug838639-v1-train

Merge pull request #7991 from daleharvey/handle-camera-errors