Bug 964188 - [Settings] fix main integration jshint
Bug 964186: Rename MozNdefRecord to MozNDEFRecord r=alive
Bug 948415 - Make mock_contact.py pythonic, make
insert_contact convert it to mozcontact API
friendly format. r=dhunt r=zcampbell
Bug 966023 - [B2G][Clock][Timer] Sounds previews continue to play from the timer "Sound list" when locking the device.
Bug 966865 - Update pdf.js to version 0.8.997.
Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device
Fixed sort() comparison in CameraUtils.selectOptimalPreviewSize().

Fixed rounding error in CameraUtils.selectOptimalPreviewSize() and added real-world test data.

Fixed sort() comparison in CameraUtils.selectOptimalPreviewSize().
Bug 968085 - Don't rely on global variable from keyboard.js in render.js
Bug 967237 - Shorten the Zh layout labels
Bug 963377 - [B2G][Keyboard] Keyboard blocks "cancel" / "ok" options
 - Still reset keyboard state when the keyboard frame is hidden, so that
   the keyboard won't be triggered by the keyboard app after it has
   been dismissed.
Bug 966622 - [contacts] import hangs at N-1 of N contacts imported from.vcf file on memory card/sd card
Bug 963050 - [SMS] Subject's line-height in composer is too high
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 967908 - Repair test_sms_contact_input_validation r=zac
Bug 934916 - [WAP push][CP] If a CP message is opened, newly coming CP or WAP push messages can still be opened but content is not displayed.
Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. r=arcturus
Merge pull request #15993 from jaoo/934916

Bug 934916 - [WAP push][CP] If a CP message is opened, newly coming CP or WAP push messages can still be opened but content is not displayed. r=gsvelto
Merge pull request #15997 from vingtetun/bug967277

Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. r=arct...
Bug 947855 - Automatic selection of APN relying on the IMSI code in the ICC card
Bug 965882 - Re-land 5a0f5ee71152e7f365bf078e345422bb2b1fef7c now that related infrastructure problems have been addressed, r=ahal