Bug 1059087 - Fix missing spacing between "Carrier Name" and "Type Label". r=francisco
Bug 1066611 - [v2.2] Fix test_geolocation_prompt
Merge pull request #24079 from chirarobert/fix_geo_2.1

Bug 1066611 - [v2.2] Fix test_geolocation_prompt
Bug 1064595 - Remove SHB from lockscreen
Bug 1065632 - Reword FxA description in FTE flow. r=sfoster
Bug 1058449 - Tapping on the settings button in contacts doesn't have any effect
Bug 1061532 - Only set the category of a newly apn item to custom when restoring from a custom apn setting
Bug 1067955 - [v2.2][v2.1] Fix test_toggle_airplane_mode
Merge pull request #24104 from chirarobert/v21_airplane

Bug 1067955 - [v2.2][v2.1] Fix test_toggle_airplane_mode
Revert "Bug 1038496 - Re-enable radio when rild crashes"

This reverts commit 171b6b8ceb6fe782121e596859a3868923e0c36c.
Bug 1030346 - removed redundant role="menuitem" from header buttons. Button is more consistent with the rest of the UI when in screen reader mode.
Bug 1030346 - make element order in markup consistent with the displayed order.
Bug 1030346 - fixed list, listbox and false list roles.

Conflicts:
	apps/communications/contacts/elements/details.html
	apps/communications/contacts/elements/settings.html
Bug 1030346 - fixed listbox dropdown roles and aria markup.
Bug 1030346 - fixed checkbox roles, state and aria markup.
Bug 1030346 - updated labels, aria labels and their aria-visibility.
bug 1064975 - Manually check evt.detail for evt.detail.filter instead of short-hand assignment. r=kgrandon
Bug 1064256 - [Contacts] "TypeError: iceGroup is null"
Bug 1060725 - Add missing tests to ICEContacts. r=Rik
Bug 1061421 - [Contacts] Delete all contacts which were set to ICE, 'ICE contacts' list is empty but the whole ICE section should be removed r=sergi