Bug 990653 - [Camera] Update unit tests for Activities
Bug 978553 - Don't try to insert the message body if the activity didn't populate it r=julienw
Merge pull request #17855 from justindarc/bug990653

Bug 990653 - [Camera] Update unit tests for Activities