Bug 940633 - [Cost Control] Fix alignment of checkboxes in usage tab.
Bug 944426 - Test for flow from Messages app to Messaging Settings, r=zcampbell@mozilla.com
Bug 948975 - Safeguard to make sure we can always resume a single held
conference call.
Bug 944224 - Forgo data URIs for Marketplace homescreen icons
Bug 952760 - Email next/previous marionette setup orange
Bug 956269 - Introduce a setting key to disable launching a keyboard app in background during boot
Bug 956031 - Ensure geolocation UI automated test checks for presence of geolocation icon in status bar
Merge pull request #15008 from AndreiH/bug956031

Bug 956031 - Ensure geolocation UI automated test checks for presence of...
Merge pull request #15031 from timdream/keyboard-launch-on-boot

Bug 956269 - Introduce a setting key to disable launching a keyboard app in background during boot, r=gary
Bug 944697 - Make the edge_gesture_test.js resolution independent. r=alive
Merge pull request #14864 from bitgeeky/944426final

Bug 944426 - Test for flow from Messages app to Messaging Settings, r=zc...
Bug 956588 - Make sure that we pass a blob when setting wallpaper

Bug 943246 removed the checking on strings. Turns out that we do want
this. So we re-introduce this, and if the wallpaper is a data URI we
directly use it.
Merge pull request #15052 from cvan/mkt-icons

Bug 944224 - Forgo data URIs for Marketplace homescreen icons, r=fabrice
Merge pull request #15063 from lissyx/bug956588

Bug 956588 - Make sure that we pass a blob when setting wallpaper r=etienne
Merge pull request #14852 from etiennesegonzac/bug-944697-edge-gesture-marionette-retina

Bug 944697 - Make the edge_gesture_test.js resolution independent.
Bug 956031 - Checking for geolocation icon precludes this test from running on CI environments r=me
Merge pull request #14921 from gaye/bug-952760

Bug 952760 - Email next/previous marionette setup orange
Merge pull request #14892 from etiennesegonzac/bug-948975-resume-single-conference-group

Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
Revert "Merge pull request #15004 from cctuan/956004"

This reverts commit 6d59734b0b1700a594b4f80f415897e3e0fde682, reversing
changes made to 56958810b8c51a513b6ef3263a362da7c9922d7f.
Merge pull request #14814 from eeejay/bug-940633

Bug 940633 - [Cost Control] Fix alignment of checkboxes in usage tab.