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 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 947855 - Automatic selection of APN relying on the IMSI code in the ICC card
Merge pull request #15968 from jaoo/947855

Bug 947855 - Automatic selection of APN relying on the IMSI code in the ICC card. r=kaze
Merge pull request #15991 from zacc/bug_967908

Bug 967908 Fix timing in test_sms_contact_input_validation.py
Bug 952312 - Screen reader settings
Bug 952554 - [SMS] Find contacts when searching with multiple terms which also include tel number
Merge pull request #15781 from eeejay/bug-952312

Bug 952312 - Screen reader settings. r=kaze
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