Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device
Bug 968085 - Don't rely on global variable from keyboard.js in render.js
Bug 967237 - Shorten the Zh layout labels
Bug 963050 - [SMS] Subject's line-height in composer is too high
Bug 952554 - [SMS] Find contacts when searching with multiple terms which also include tel number
Bug 957497 - Allow include of uncompressed data files in the package apps

Conflicts:
	build/utils-xpc.js
	build/utils.js
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
Merge pull request #15736 from fcampo/subject-too-high-bug963050

Bug 963050 - [SMS] Subject's line-height in composer is too high
r=julien
Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebook do not sync every 24 hours to reflect profile changes.
Merge pull request #15961 from yurenju/uncompress-2

Bug 957497 - Allow include of uncompressed data files in the package apps r=@timdream
Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju
Bug 962938 - Inconsistent file path in zip file
Merge pull request #14298 from dwi2/bug938080

Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually r=crh0716
Bug 966902 - [Rocketbar] Input handling. Do not clear search term. r=benfrancis
Merge pull request #16024 from jmcanterafonseca/fb_sync_fixed

Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebo...
Bug 968103 - [Rocketbar] Cancel button launches active card r=auswerk
Merge pull request #15938 from AndreiH/bug964820

Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device
Merge pull request #16029 from KevinGrandon/bug_968103_cancel_rocketbar

Bug 968103 - [Rocketbar] Cancel button launches active card r=auswerk