Bug 964188 - [Settings] fix main integration jshint
Bug 964186: Rename MozNdefRecord to MozNDEFRecord r=alive
Bug 966023 - [B2G][Clock][Timer] Sounds previews continue to play from the timer "Sound list" when locking the device.
Bug 966622 - [contacts] import hangs at N-1 of N contacts imported from.vcf file on memory card/sd card
Bug 951159 - Convert Gaia UI Tests to new notification API
Revert "Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call"

This reverts commit a69025bfe657a07cca372369e0d4b83a442fba73.
Bug 924624 - [User story] Add edge gestures to FTE tutorial r=arcturus
Bug 968729 - Add unit test for Bug 963377
Bug 968382 - software home button doesn't work when rocketbar is active r=alive
Merge pull request #15994 from samjoch/bug-924624-UserStoryAddEdgeGesturesToFTETutorial

Bug 924624 - [User story] Add edge gestures to FTE tutorial r=arcturus
Merge pull request #16015 from gentlefolk/951159

Bug 951159 - Convert Gaia UI Tests to new notification API
Merge pull request #16020 from dominickuo/revert-bug-946556

Revert "Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call
Bug 966951 - "Group Call" is inactive when received call is hung up
Merge pull request #15955 from Rik/inactive-group-after-finishing-call-966951

Bug 966951 - "Group Call" is inactive when received call is hung up r=etienne
Bug 933365 - [Messages] Consider adding the resend option in the message context menu for errored message
Merge pull request #15789 from svic/Bug_964186

Bug 964186: Rename MozNdefRecord to MozNDEFRecord
Bug 968794 - Test test_settings_do_not_track fails intermittently on device
Bug 968778 - [browser] "Cancel" is hard-coded in the dialog appearing when long tapping on a link
Bug 951080 - [Clock] Adjustment for setting a new or editing an alarm. r=hhuang
Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call