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 967277 - [Contacts] Scrolling the contacts app causes reflow. r=arcturus
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
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
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.