Merge pull request #14721 from dwilsoncaf/bug-950800

Bug 950800 - Add hardware composer setting, r=kaze
(cherry picked from commit 5aff5fbf73f6340adcef67f8984f7ad28a32ef90)
Bug 952533 - [Messages] The contact lookup fails in some situation r=rwaldron

* Bail out early if the current contact does not have the wanted field

(cherry picked from commit 07fba612546fd27b78efc7373c59c2f1331db240)
Merge pull request #14591 from daleharvey/946807

Bug 946807 - Dont postResult to activity with no return value r=benfrancis
(cherry picked from commit a14c8ba9fa829cdfa746bda2b88df642daee025a)