Merge pull request #18539 from benfrancis/997920

Bug 997920 - Deactivate Rocketbar with cancel button r=daleharvey
Merge pull request #18536 from bobsilverberg/fix_kb_v1.3

Bug 999520 - Update keyboard app's dismiss method to work on v1.3 too
Bug 1000062 - Delete some more redundant tests
Revert "Bug 999355 - Wait for 'render' class on appWindow to denote Gaia startup r=bebe"

This reverts commit 2aee4c38dee335f06951ef4e17f22b2f2ed8bd18.
Bug 999569 [NFC] Initialization test cases for NfcManager
Merge pull request #18233 from julienw/995173-fix-notice-timeout-v2

Bug 995173 - [Messages] The in-app notification for the "message is too ...
Merge pull request #18686 from bebef1987/gallery

Bug 1000062 - Delete some more redundant tests
Bug 1000334 - Adjust b2g_start to work for v1.3 as well
Bug 1001210 - Hide start page before showing task manager r=kgrandon
Merge pull request #18670 from cctuan/968661-6

Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.j...
Bug 995605 - [Sora][Message][MMS]Can't add the text in content when forward a media MMS r=schung

The issue is that in compose.js, "pointer-events: none" is added after it's
removed, in this case.

This patch ensures that SMIL.parse always calls the callback in an asynchronous way,
so that the caller does not have any surprise.
Merge pull request #18647 from julienw/999553-reenable-most-disabled-unit-tests-enable-render-test

Bug 999553 - Reenable most disabled unit tests on TBPL r=jgriffin
Bug 1000047 - Hardening the callscreen against a transition end race.
Merge pull request #18613 from mcav/delete-alarm

Bug 1000496 - [B2G][Clock]Deleting an alarm then killing the clock app a... r=millermedeiros
Merge pull request #17901 from rsajdok/bug#989389

Bug 989389: Confirmation messages when setting or un-setting mutliple em... r=jrburke
Bug 996252 - Intermittent TEST-UNEXPECTED-FAIL | test_settings_change_language.py test_settings_change_language.TestChangeLanguage.test_change_language_settings | after TimeoutException: Timed out after 10.0 seconds
Bug 846909 - Inject performance helper atom with marionette
Revert "Merge pull request #18647 from julienw/999553-reenable-most-disabled-unit-tests-enable-render-test"

This reverts commit 0d0746788fad5cb60937a8cc668b13fc6eadb105, reversing
changes made to c6f4657a4ec2d9fc4fff7b7b8f96f91ef3bd13c2.
Bug 1000272 - Show google search link if < 2 places results. r=benfrancis
Bug 1001638 - [Home2] Final user testing tweaks r=me