Bug 988610 - [Camera][Madai] Black screen when opening camera from lockscreen and camera app isn't open
Merge pull request #17730 from justindarc/bug988610

Bug 988610 - [Camera][Madai] Black screen when opening camera from locks...
Bug 978553 - Don't try to insert the message body if the activity didn't populate it r=julienw