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