Merge pull request #9826 from daleharvey/camera-monkey

Bug 867025 - Disable cancel activity button when picture taken r=@davidflanagan(cherry picked from commit 771ad40f7f7fc3b36aae2ea0c25b091e29d626c6)
Merge pull request #9855 from davidflanagan/bug867025-v1-train

Merge pull request #9826 from daleharvey/camera-monkey