Bug 1059087 - Fix missing spacing between "Carrier Name" and "Type Label". r=francisco
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
Revert "Bug 1038496 - Re-enable radio when rild crashes"

This reverts commit 171b6b8ceb6fe782121e596859a3868923e0c36c.
fixes bug  1068601: Remove Guided Tour