Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery
Merge pull request #15968 from jaoo/947855

Bug 947855 - Automatic selection of APN relying on the IMSI code in the ICC card. r=kaze
(cherry picked from commit f0f269123886391106ebb37ce738274c1c91df84)
Merge pull request #14298 from dwi2/bug938080

Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually r=crh0716
(cherry picked from commit 7689a80de843f12ad99b0fd6c19cb7040aba0634)
Merge pull request #16024 from jmcanterafonseca/fb_sync_fixed

Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebo...
(cherry picked from commit 0417f87b62b9b7ebbc48c1e9e1e3a144e0b64d70)
Merge pull request #16047 from flodolo/bug968778

Bug 968778 - [browser] "Cancel" is hard-coded in the dialog appearing when long tapping on a link r=benfrancis
(cherry picked from commit b374f60685d624008bb55b50f0127136493d221b)
Merge pull request #15989 from staktrace/nocheck-setting

Bug 967502 - Expose gaia developer setting for no checkerboarding. r=vin...
Merge pull request #15957 from millermedeiros/966516-picker-bigger-month

Bug 966516 - [B2G][Calender]Changing the month in an event doesn't update to the number associated with that month r=gaye
(cherry picked from commit 7dd74e8ca3c444daa8ad724c22aa212cacbe8fb9)

Conflicts:
	apps/calendar/test/unit/.jshintrc
Merge pull request #16011 from davidflanagan/bug942199v1.3

Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery r=dmarcos
Merge pull request #15736 from fcampo/subject-too-high-bug963050

Bug 963050 - [SMS] Subject's line-height in composer is too high
r=julien(cherry picked from commit d876a70c6d96e8c67a26897d8d4d508407b7581d)

Conflicts:

	apps/sms/style/sms.css