Bug 1073745 - [Lockscreen] Unlock to camera twice brings a blank screen.
Bug 1067684 - The FTU flow should be aware of network connectivity
Bug 1074512 - [TaskManager] Allow search app role in filter
Bug 1061422 - [Contacts] ICE can be set to a contact without number
Bug 1073566 - [Utility Tray] Alignment of header text
Follow up on Bug 1057977 - [Status Bar] Remove AM/PM indicator

Conflicts:
	build/config/common-settings.json
Merge pull request #24747 from gmarty/Bug-1073566-Utility-Tray-Alignment-header-text-v2.1

Bug 1073566 - [Utility Tray] Alignment of header text
Merge pull request #24533 from KevinGrandon/bug_1074512_to_two_dot_one

Bug 1074512 - [TaskManager] Allow search app role in filter
Merge pull request #24686 from crdlc/bug-1061422

Bug 1061422 - [Contacts] ICE can be set to a contact without number
Bug 1071787 [SMS] "Go to Camera" button cancels popup when attempting to attach a video with no videos on device
Bug 1073651 - Disable intermittent test_a11y_keyboard_key_names.py a=test-only
Merge pull request #24551 from snowmantw/issue1073745-v2.1

Bug 1073745 - [Lockscreen] Unlock to camera twice brings a blank screen.
Bug 1043959 - Remove the browser app r=kgrandon
Merge pull request #24755 from benfrancis/1043959-2.1

Bug 1043959 - Remove the browser app r=kgrandon
Merge pull request #24714 from giovannic/ftu-flow-21

Bug 1067684 - The FTU flow should be aware of network connectivity
Bug 1053647 - delete space when reverting an autocorrection and don't insert space when user selects a word suggestion

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/accessibility/keyboard/test_a11y_keyboard_word_suggestions.py
	tests/python/gaia-ui-tests/gaiatest/tests/functional/keyboard/test_keyboard_predictive_key.py
Bug 1072458 - Certain characters cannot be input using Bangla keyboard
Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
Bug 1074499 - Check setCallingLineIdRestriction directly instead of using hasOwnProperty
Bug 1068978 - [CBS] Migrate all ril.cellbroadcast.disabled setting to multi client format