Bug 940633 - [Cost Control] Fix alignment of checkboxes in usage tab.
Bug 939679: compute the right camera preview size on HD devices
Bug 834113 - Bluetooth Address in Settings

Add Bluetooth address under Device information > More information
Bug 948975 - Safeguard to make sure we can always resume a single held
conference call.
Bug924170 - [Video] - Add Marionette tests for Video App r=jugglinmike
Bug 939962: set the willReadFrequently flag when creating the 2D context for saving an edited image
Bug 944224 - Forgo data URIs for Marketplace homescreen icons
Bug 952760 - Email next/previous marionette setup orange
Bug 944697 - Make the edge_gesture_test.js resolution independent. r=alive
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.
Bug 892950 - error-network message can use better English
Bug 952762 - Reenable email reply tests