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