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 952554 - [SMS] Find contacts when searching with multiple terms which also include tel number
Bug 951159 - Convert Gaia UI Tests to new notification API
Bug 957497 - Allow include of uncompressed data files in the package apps

Conflicts:
	build/utils-xpc.js
	build/utils.js
Merge pull request #15976 from RudyLu/keyboard/Bug963377-keyboard_covers_value_selector

Bug 963377 - [B2G][Keyboard] Keyboard blocks "cancel" / "ok" options, r=timdream
Bug 968116 - Clear pairingAddress when users cancel the pairing in passive mode
Revert "Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call"

This reverts commit a69025bfe657a07cca372369e0d4b83a442fba73.
Merge pull request #15956 from justindarc/master

Fixed sort() comparison in CameraUtils.selectOptimalPreviewSize().