Merge pull request #13053 from jimporter/music-nowplaying-icon

Bug 930386 - Fix the "now playing" icon that gets sent to the system app; r=dkuo
Bug 903232 - Show only gsm options by default
Merge pull request #12100 from Seinlin/Bug-914459

Bug 914459 - Use keyboard's basicLayoutKey if it is defined. r=janjongboom
Merge pull request #12002 from KevinGrandon/bug_908947_usage_dom

Bug 908947 - Use HTML import polyfill for Usage DOM r=salva
Merge pull request #13039 from zacc/930044

Bug 930044 - Python UI tests Enhance wait in test_sms_with_attachments t...
Bug 930417 - (Cost Control) Typo in short name for December

Should be DEC, not DEV. Affecting also 1.2
Merge pull request #13019 from etiennesegonzac/bug-852314-dialer-keypad-enabling

Bug 852314 - Enabling the oncall keypad asap according to the 3GPP spec. r=ferjm
Bug 929999 - Bump marionette_client dependency to 0.6.1 or above
Bug 906549 - [Flatfish][LockScreen] add support for large device for portrait
Bug 914407 - Correct the Do Not Track header values
Merge pull request #13054 from timdream/reverse-dnt-value

Bug 914407 - Correct the Do Not Track header values, r=arthurcc
Revert "Bug 904984 - Add APBW to the APN database"

This reverts commit dcbef3b68374b879bca4276e0df9b4fb5f8afb52.
Bug 904984 - Add APBW to the APN database
Bug 929728 - Add a B2G developer settings option to enable APZ in all content processes. r=vingtetun
Merge pull request #13061 from bebef1987/marionette_0.6.1

Bug 929999 - Bump marionette_client dependency to 0.6.1 or above
Merge pull request #12922 from alivedise/bugzilla/927310/activity-done-in-mozbrowser

Bug 927310 - Activitydone event in mozbrowser iframe
bug 930469, malformed properties file.
Remove leftover merge conflict marker
Merge pull request #13047 from zacc/bug_929636

Bug 929636 - Changed skipped Python UI tests to use fail-if
Bug 918179: Optimize append case in tag_visibility_monitor
Bug 929926 - LICENCE is mis-spelled