Merge pull request #9532 from bakulf/wakelock

    Bug 859824 - [AudioChannel/Music App] Music App Didn't Release Wakelock When paused by AudioChannel, r=@dominickuo(cherry picked from commit 00e8ded6c27b79570020bc1add0cf6c0c6413450)
Bug 869346 - [System] [Video] [Bluetooth] String message is half-hidden when Share->Bluetooth is selected on a video.
Merge pull request #9542 from rnowm/banner-update

Bug 868391 - [Building Blocks] Alerts should be updated(cherry picked from commit 8513e27db3232a71a2e3eec90c8985930cd48540)

Conflicts:

	shared/style/status.css
Bug 849365 - Change the input size to 16 and the input type to text.
Merge pull request #9591 from crdlc/bug-868258

Bug 868258 - Followup to bug 860681 - Icons revert to default in 3rd par...(cherry picked from commit 1f05e95b6d4a562a15fd7f3812c31d8208138a8b)

Conflicts:
	apps/homescreen/js/grid.js
	apps/homescreen/test/unit/mock_grid_manager.js
	apps/homescreen/test/unit/mock_icon.js
Bug 870683 - Handle SCO
Merge pull request #9668 from jaoo/869979

Bug 869979 - Wrong APN settings for Chile. r=kaze(cherry picked from commit 509ed155de7575ff650079dd294e4492e5e11f3d)
Bug 851995 - [Buri][BT]Can not open received file transfer from other MS/PC
Bug 865999 - After landing import from vCard Contact Settings screen is visually broken [r=arcturus,jhford]

Merged https://github.com/mozilla-b2g/gaia/commit/6f7897135f4cc70fb21eb3c737df4249a29c673b
Merge pull request #9811 from ian-liu/v1_train/bluetooth/string_message_of_turn_on_bt_dialog_truncated_in_landscape_mode

Bug 869346 - [System] [Video] [Bluetooth] String message is half-hidden when Share->Bluetooth is selected on a video. r=@alivedise
Merge pull request #9198 from pivanov/bug-808250

Bug 808250 - In Display settings, the icons for brightness slider seem flipped to people (followup) r=samjoch

(cherry picked from commit b65dbaace1bfc940db6f10aee6ad3c54187d25aa)

Conflicts:
	apps/settings/style/images/range_icons_brightness_min@2x.png
Merge pull request #9764 from fcampo/ussd-l10n

Bug 863297 - PIN related labels are not correctly localized: mmi update (r=etienne)(cherry picked from commit d510063ad9ea78cfa47fb27c85246b1c0cf85c44)
Merge pull request #7991 from daleharvey/handle-camera-errors

Bug 838639 - Add an error handler when we fail to take a picture(cherry picked from commit 04a78898293bfb943f103874040b587a1026ff19)
Bug 866036 - [Buri][Audio]Can't adjust game volume. (Poppit) r=alive
(cherry picked from commit 7c87f0b247f04996c7173a22be249f9304e2ad9c)
Merge pull request #9853 from davidflanagan/bug838639-v1-train

Merge pull request #7991 from daleharvey/handle-camera-errors
Merge pull request #9818 from gtorodelvalle/dialer-bug-872054-busy-tone-on-speaker

Bug 872054 - [Inari] Busy line tone is heard through the speaker (r=etiennesegonzac)(cherry picked from commit 57568a25435d46c50015c2005eb13171e92dd21b)
Bug 866481 - Properly handling emergency calls coming from the
lockscreen.
r=arcturus
(cherry picked from commit 2b8914b3c70f5c12b9ec42c58d2fcb3bb0e1e8a9)
Merge pull request #9794 from arcturus/bug-872512

Bug 872512 - [CONTACTS][FTU] Use the new OAuth redirection mechanism to log in services like Facebook, Gmail or Outlook(cherry picked from commit 0478fc101cc6ba6bc828dcc708daeb7742d9fbda)
Merge pull request #9754 from mpizza/fixd_typo_ceWarningcontent

Bug 871681 - [system] typo in ceWarningcontent: 'hight' instead of 'high', r=alive, pike(cherry picked from commit adf7fedc37ddef00b6ce1e2eb7bd3855c80856f4)
Merge pull request #9757 from deadsquid/google

Bug 811824 - Change default search to Google r=benfrancis(cherry picked from commit 8793aee46cfba6a506bc0f8f26f483183329fd62)