Bug 911677 - hide phone-related settings if telephony is not available
Bug 911670 - Change Wording of phonelock

- make phonelock wording more generic
Bug 901349 - "<span>" showing in the update manager
Bug 906598 - Move Keyboard settings into app itself
bug 913701

MozSettings must be present at all times because it's required by simple_operator_variant_helper.js. If it's not present on window.navigator it will cause test failures because SimpleOperatorVariantHelper cannot function as expected.
Bug 909708 - [CONTACTS] On Export contacts "To SIM" option is active when there isn't a SIM card in the device.
Bug 914130 - Exporting contacts keeps the previous state
Bug 911978 - If no contacts are present export should be disabled
Bug 914493 - [Email] iframe is not resized for the embedded images that were already downloaded while building body. r=asuth
Merge pull request #12017 from EragonJ/bug-911670

Bug 911670 - Change Wording of phonelock r=crh0716
Merge pull request #11782 from comoyo/keyboard_settings

Bug 906598 - Move Keyboard settings into app itself. r=RudyL
Bug 800002 - [Gallery] Edit mode exposure polish
Merge pull request #12059 from asutherland/email-resize-embedded-reload

Bug 914493 - [Email] iframe is not resized for the embedded images that were already downloaded while building body. r=asuth
Bump marionette-helper to 0.0.7
Merge pull request #12064 from gaye/bump-marionette-helper-007

Bump marionette-helper to 0.0.7
Merge pull request #10296 from samjoch/bug-800002-GalleryEditModeExposurePolish

Bug 800002 - [Gallery] Edit Mode Exposure Polish r=djf
Merge pull request #12043 from nullaus/browser-test-fix

Bug 913701 - Unit Test for Operator Variant Customizations is failing
Bug 908679 - Redesign the status bar version of the call screen

- Improve fake-oncall-desktop to never run on the phone
- Split oncall.css for the two states of the call screen
Bug 908989 - [Buri][WIFI]Can't turn on/off wifi from pull down state bar r=Arthur
Bug 913516 - Adding a display name as fallback when no name is available to show.