Bug 1030552 - [Calendar] "All day" on month view is not localized for All day events
Bug 1031012 - [B2G][Camera]Self-timer cannot be canceled
Revert "Bug 1022115 - [Contacts] Cannot tap and see detail of contact when importing multiple via Bluetooth"

This reverts commit 5725321dd1aef29077b6fc5c4c49b43dccf208dc.
Merge pull request #20781 from frsela/STK/Bug1026377

Bug 1026377 - [Sora]There is no highlight stripe when selecting some option in STK menu, r=jaoo
Merge pull request #21354 from justindarc/bug1031012-v2.0

Bug 1031012 - [B2G][Camera]Self-timer cannot be canceled
Merge pull request #20796 from pacorampas/call-screen-space-name-number-1026341

Bug 1026341 - [Dialer][Call Screen][Flame] Some space, a thin line, not covered by name, number white background r=rik
Merge pull request #21297 from jrburke/bug911412-email-view-icon

Bug 911412 - [Buri][fugu][Language][Email]The view the attachment Button is truncated r=jrburke
Merge pull request #21270 from Cwiiis/bug1031094-squashed

Bug 1031094 - Don't remove bookmarks from collections when uninstalling. r=kgrandon
Merge pull request #21308 from KevinGrandon/bug_1033632_collection_user_select

Bug 1033632 - [Collections] Highlight on all app title occurs when tapping on a title of an app
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