Bug 1030552 - [Calendar] "All day" on month view is not localized for All day events
Bug 1033220 - [Vertical Homescreen] Intermittent MarionetteJS failure on Travis: Vertical - Collection create collection shows message when offline r=daleharvey
Bug 1034202 - [Vertical] Intermittent failing test, Vertical Home - Packaged App Update resume update r=me
Bug 1020917 - Lock screen no longer blocks home key press
Merge pull request #21352 from snowmantw/issue1020917-2.0

Bug 1020917 - Lock screen no longer blocks home key press
Bug 1028101 - Intermittent system/test/unit/bootstrap_test.js r=etienne
Bug 1030415 - Use lockscreen-request-unlock to show homescreen or app
Merge pull request #21378 from alivedise/bugzilla/1030415_v2.0/app-home-race

Bug 1030415 - Use lockscreen-request-unlock to show homescreen or app, r=timdream
Bug 1031029 - Unlock the lockscreen only if enabled
Bug 990537 - [DSDS] Messaging. Apply Visual Refresh to DSDS scenarios r=schung

* use :before instead of :after so that we re not affected by building blocks
* add the sim indication back
* use the correct style for the sim indication
* move the dsds CSS to composer.css
* correctly center the counter and MMS indicators

(cherry picked from commit 1391064a106b66b02b0b7b9e7e43c9bc775ba586)

Conflicts:
	apps/sms/index.html

* adds an hacky property file so that we don't need a localization on v2.0
Merge pull request #21287 from millermedeiros/1030552-all-day-l10n-2.0

Bug 1030552 - [Calendar] "All day" on month view is not localized for All day events r=gaye
Bug 1034729 - [Vertical] Mis-named test, app_hosted_use_cached_icon.js, does not run r=me
Merge pull request #21156 from RudyLu/keyboard/Bug1029798

 Bug 1029798 - Auto suggest should not add a character space as it makes..
r=djf
a=2.0+
(cherry picked from commit cfa144ea2400f99db77669c9954bb2cdeaac2526)

Conflicts:
	apps/keyboard/test/unit/suggest_test.js
Merge pull request #20392 from fcampo/import-bt-err-tap-1022115

Bug 1022115 - [Contacts] Can't see detail of contact when multi import via Bluetooth (r=francisco)
Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
	apps/communications/contacts/test/unit/mock_activities.js
Merge pull request #20880 from chuck-lee/bug-1010252_reconnect_issue

Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
Merge pull request #20986 from frsela/STK/Bug1027521

Bug 1027521 - [Sora]Phone returns to wrong screen when trying to return to previous screen in STK menu, r=jaoo
Merge pull request #21395 from julienw/990537-v2.0-dsds-refresh

Bug 990537 - [DSDS] Messaging. Apply Visual Refresh to DSDS scenarios
Bug 1032288 - Intermittent failing test, Vertical Home - Packaged App Update resume update, TypeError: entry.app.manifest is undefined
Merge pull request #20150 from eliperelman/bug-837668-implement-loading-events-dialer

Bug 837668 - Implementing new startup loading events in Dialer app
Conflicts:
	tests/performance/startup_events_test.js
Merge pull request #20464 from jrburke/bug837677-email-startup-events

Bug 837677 - [e-mail] Implement new startup loading events r=mcav
Conflicts:
	tests/performance/startup_events_test.js