Bug 1061532 - Only set the category of a newly apn item to custom when restoring from a custom apn setting
Bug 1065018 - [camera] Focus ring is not always aligned
Bug 1064903 - Update to latest gaia-icons
Bug 1064315 - [camera] Update gaia-header and gaia-icons
Bug 1065421 - Add theme color to clock
Bug 1065922 - Pinyin and Zhuyin layout have duplicate period keys in its
alternative char menu.
 - Remove redundant period symbol from the alternative char menu.
Bug 1061858 - [Cost Control][Usage app] Usage app disables Wifi tracking after exiting/launching Usage app
Bug 1065286 - [NFC] TNF_RESERVED usage removal, r=gweng
Revert "Bug 1052241 - Disable network activity icon in DEBUG mode"

This reverts commit bcc84b7dcb3be974ca7a329f1aa63c9cfb1c4f91.

Conflicts:
	apps/system/js/statusbar.js
Bug 1063310 - [email] When sending multiple attachments, all but the first are sent as zero-byte attachments. r=asuth
Bug 1064595 - Remove SHB from lockscreen
Bug 1066354 - Fix migration to use new promise instead of callback
Bug 1062334 - Update ambient indicator colour
Bug 1054121: Update wording and layout of Data Sharing FTU screen. r=sfoster r=Pike
Bug 983172 - Parsing jpeg header information for downsampling the image for thumbnail, r=azasypkin
Bug 1066482 - [Contacts] [Regression] Cannot add a new contact with only date (birthday or anniversary)
Merge pull request #23860 from wilsonpage/1064903

Bug 1064903 - Update to latest gaia-icons
Merge pull request #23868 from wilsonpage/1064315

Bug 1064315 - [camera] Update gaia-header and gaia-icons
Merge pull request #23996 from jmcanterafonseca/fix_bday

Bug 1066482 - [Contacts] [Regression] Cannot add a new contact with only...
Bug 1066577 - [v2.2] Fix test_dialer_from_message