Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
Bug 975535 - E.me followups [r=ranbena]
Bug 992393 - [camera][madai] preview mode UI updates
Merge pull request #18428 from justindarc/bug992393-v1.4

Bug 992393 - [camera][madai] preview mode UI updates
Merge pull request #18390 from mcav/icon-repeated

Bug 992876 - Reply icon repeated. r=jrburke
Conflicts:
	apps/email/js/cards/message_reader.html
Merge pull request #17561 from jrburke/bug985598-email-double-activity-blank

Bug 985598 - [email] Double-triggering of share/new activity by clicking... r=asuth
Merge pull request #18116 from dwi2/bug975293

Bug 975293 - Make sure we have _containerElement defined in the context ...
Merge pull request #18069 from jaoo/991628

Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name. r=arthurcc
Merge pull request #18217 from etiennesegonzac/bug-993807-network-initiated-mmi

Bug 993807 - Making sure the MmiManager is initialized for network initiated MMI sessions. r=rik
Merge pull request #18363 from steveck-chung/bug-992233

Bug 992233 - 984153 regressed the background color for suggestions list. r=julienw(cherry picked from commit 559c4b4d8bf5bfeb5c6ad7a22ddcf01949f15c74)

Conflicts:

	build/csslint/xfail.list
Bug 997461 - Cannot open bookmarks installed with v1.3 in v1.4
Bug 991856 - [Camera][Madai] Implement the new design for the focus ring
Merge pull request #18492 from justindarc/bug991856-v1.4

Bug 991856 - [Camera][Madai] Implement the new design for the focus ring
Merge pull request #16893 from chuck-lee/bug-907028_Wifi_Wake_Lock

Bug 979130 - Turn Wifi into power save mode while screen off with wifi lock held.
Merge pull request #18483 from crdlc/bug-997461-v1.4

Bug 997461 - Cannot open bookmarks installed with v1.3 in v1.4
Bug 988760 - Workaround for glitchy sound when playing the busytone r=etienne

(cherry picked from commit d3a918483a7342052ede64bcb5dc6c72f5356212)
Merge pull request #18379 from justindarc/bug996513

Bug 996513 - [Flame][Camera] front camera can not work in master branch
Merge pull request #17956 from DouglasSherk/965854-voicemail-sim-indicator

Bug 965854 - [DSDS][System] Display SIM indication in voicemail notification. r=etienne
Conflicts:
	apps/system/index.html
Merge pull request #18462 from justindarc/bug993686

Bug 993686 - [B2G][Camera] - Tapping repeatedly on capture button while ...
Merge branch 'v1.4-bug-975535-homescreen' of github.com:samjoch/gaia into samjoch-v1.4-bug-975535-homescreen

Conflicts:
	external-apps/marketplace.firefox.com/application.zip