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 964342: Send language setting to basket.

* Add error codes to basket client.
* Use error code for invalid email instead of looking for a message.
Bug 968729 - Add unit test for Bug 963377
Bug 968382 - software home button doesn't work when rocketbar is active r=alive
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
Bug 951092 - [Clock] Adjust Pause/Cancel buttons size and style in Timer. r=jburke
Use TimerPanel.prototype.onvisibilitychange. r=jugglinmike
Bug 951096 - [Clock] Adjust Stop/Lap buttons size and style in Stopwatch. r=jburke
Bug 966571 - Retry count not shown up in System SIM Dialog
Merge pull request #15982 from gtorodelvalle/contacts-bug-966622-importing-from-vcf-file

Bug 966622 - [contacts] import hangs at N-1 of N contacts imported from vcf file on memory card/sd card
Merge pull request #16047 from flodolo/bug968778

Bug 968778 - [browser] "Cancel" is hard-coded in the dialog appearing when long tapping on a link r=benfrancis
Merge pull request #16039 from dominickuo/bug-946556-new

Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call, r=jimporter