Merge pull request #18505 from zbraniecki/999195-cleanup-mozl10n-emergency-call

Bug 999195 - Clean up bootstrap mozL10n API use in Emergency Call
Merge pull request #18305 from svic/Bug_966921

Bug 966921 - Restore state of BT adapter after a file transfer. r=evelyn
Merge pull request #17842 from EragonJ/bug-973440

Bug 973440 - [settings] refactor Screen lock panel with AMD pattern
Merge pull request #18473 from RickyChien/bug-998759

Bug 998759 - Remove chai.js copying when running make update-common r=@yurenju
Merge pull request #18511 from RickyChien/bug-998776

Bug 998776 - [Follow up of Bug 991446] Fix the broken coverage result on console r=@yurenju
Bug 998776 - Follow-up, update gaia_node_modules.revision
Merge pull request #18615 from RickyChien/bug-998757-follow-up

Bug 998776 - Follow-up, update gaia_node_modules.revision r=me
Bug 985341 - Fix uitest-privileged for test_video_capture_prompt failure
Bug 973454 - [settings] refactor App permissions panel with AMD pattern
Bug 936729 - [Messages][Sharing]MMS does not return to original app after cancelling or sending message. Share activity converted from 'window' to 'inline'. r=julien
Bug 991906 - [B2G][Homescreen] Long pressing an App that opened in Landscape mode will cause the Dock apps to shift
Merge pull request #18565 from cctuan/973454-2

Bug 973454 - [settings] refactor App permissions panel with AMD pattern
Revert "Bug 998776 - Follow-up, update gaia_node_modules.revision"

This reverts commit 4216a38e9afbfec52561ce733cbfa02bfd18efc7.
Revert "Bug 998776 - [Follow up of Bug 991446] Fix the broken coverage result on console"

This reverts commit 023d2f072a5f4703decb25dbff4614bb61ff904e.
Merge pull request #18322 from frsela/STK/Bug980670

Bug 980670 - [BURI] 'SIM 1' shown under STK carrier label. r=vingtetun
Revert "Merge pull request #18565 from cctuan/973454-2"

This reverts commit 16564862869a3667af220466e48f7840c7beb8ff, reversing
changes made to 0814a85e335006475d995212691545af87e97185.
Revert "Merge pull request #17842 from EragonJ/bug-973440"

This reverts commit afcd647bb13598c1a101ac900207f4b479d26734, reversing
changes made to 6f689126518660ec160aecc25432cf47d10662eb.
Merge pull request #18516 from crdlc/bug-991906

Bug 991906 - [B2G][Homescreen] Long pressing an App that opened in Lands...
Bug 978781 - SV: NFC enabled/disabled by default customized by SIM
Merge pull request #18587 from crh0716/1000172

Bug 1000172 - Prevent scripts defining global from being removed during the optimization r=evelyn