Merge pull request #14453 from arroway/bug-945111

Bug 945111 - [settings] Update permissions_table to match PermissionsTab...
Merge pull request #14839 from KevinGrandon/rocketbar2

Bug 946452 - Rocketbar Search App
Merge pull request #14844 from comoyo/952086

Bug 952086 - Load forms.js in desktop helper r=kgrandon
Revert "Bug 949730 - Investigate test_cleanup_scard unittest failure for breaking gaia ui tests"

This reverts commit f916c32b344bb66135c540a0f083454a3e6aab68.
Bug 948341 - Convert Dialer to make use of the new Notification API

Usage of the new API maks the code cleaner, we only depends on
NotificationHelper for getIconURI. Since bug 890440 landed, when this
new API is used there is no more hack to remove notification, so we have
to handle it ourself:
 - we have to close the notification in the 'click' event handler that
   we install
 - when we load the call log, we check for any notification and close
   them.

The second point allows us to fix correctly bug 926318.
Merge branch 'master' of https://github.com/mozilla-b2g/gaia
Merge pull request #14791 from askeing/951516

Bug 951516 - Intermittent of email tests
Merge pull request #14766 from comoyo/dutch_apostroph

Bug 951190 - Remove ' from Dutch keyboard. r=rlu
Bug 952097 - [Rocketbar] Add cancel button r=vingtetun
Bug 949062 - Update test_music.py file to be more explicit about failing to play the mp3 file
Merge pull request #14583 from nbp/marionette-with-serial

Bug 948992 - Give deviceSerial number to ADB's device manager.
Merge pull request #14806 from gtorodelvalle/contacts-bug-949470-ben-kelly-patch

Bug 949470 - [Contacts] Broken image links when entering the search mode
Merge pull request #14751 from TheoChevalier/call-waiting-switch-fix

Bug 951123 - [Settings] Call waiting switch on "Confirm Call waiting", r=kaze
Bug 952058 - [Download Manager] Download confirm dialogs are not removed from DOM
Bug 951298 - placing 5 icons in the dock and then going in and out of edit mode on the homescreen will chop the 5th icon. r=crdlc
Merge pull request #14840 from gtorodelvalle/contacts-bug-946260-broken-links-when-scrolling

Bug 946260 - [Contacts] Broken link image shown for contacts when scrolling instead of their photo
Bug 946064 - [fugu][buri][contact] contact photo refresh when taping on favorite icon
Bug 952168 - Edges gestures tests are failing on TBPL
Merge pull request #14756 from julienw/936369-fix-keyboard-manager

Bug 936369 - [system] Intermittent Travis Unit Test Failure: KeyboardMan...
Bug 933093 - Implementation of HandoverManager for file transfer