Bug 964186: Rename MozNdefRecord to MozNDEFRecord r=alive
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 963050 - [SMS] Subject's line-height in composer is too high
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
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().
Merge pull request #16018 from crh0716/968116

Bug 968116 - Clear pairingAddress when users cancel the pairing in passive mode r=evelyn
Merge pull request #15969 from timdream/zh-layout-rename

Bug 967237 - Shorten the Zh layout labels, r=rudyl
Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually
Merge pull request #15823 from mihai/bug_952554

Bug 952554 - [SMS] Find contacts when searching with multiple terms...
r=julien