Bug 1027144 - Re-enable test_homescreen_move_app.py, test_homescreen_delete_app.py
Bug 1021284 - [camera] [flame] spinner appears after every photo capture
Bug 1030552 - [Calendar] "All day" on month view is not localized for All day events
Merge pull request #21289 from wilsonpage/1021284-v2.0

Bug 1021284 - [camera] [flame] spinner appears after every photo capture
Bug 1033346 - [v2.0] Fix test_homescreen_move_app.py failure
Revert "Merge pull request #21235 from snowmantw/issue1020917-2.0"

This reverts commit ee4cc647c7a599b210f9d8e76505f22926539d79, reversing
changes made to 7ad00b0bd84d5d97e0801e3b3ceaac33fcd90e05.
Bug 1031012 - [B2G][Camera]Self-timer cannot be canceled
Merge pull request #21276 from chirarobert/enable_home_del_app

Bug 1027144 - Re-enable test_homescreen_move_app.py, test_homescreen_del...
Bug 1022115 - [Contacts] Cannot tap and see detail of contact when importing multiple via Bluetooth

Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
	apps/communications/contacts/test/unit/mock_activities.js
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