Merge pull request #14721 from dwilsoncaf/bug-950800

Bug 950800 - Add hardware composer setting, r=kaze
(cherry picked from commit 5aff5fbf73f6340adcef67f8984f7ad28a32ef90)