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 1052465 Hide Sim icon when not active
Bug 1064156 - Add unit test for bug 824131 - Wifi wrong password notification
Bug 1063970 - [Messages][Refresh] Update styles of phone and url links located inside messages. r=schung
Bug 1064903 - Update to latest gaia-icons
Bug 1064315 - [camera] Update gaia-header and gaia-icons
Bug 1065421 - Add theme color to clock
Bug 1064630 - [Lockscreen] Locking device after entering a passcode leaves the user in an unrecoverable state
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 1059713 - [Settings] The string in the alert msg should be changed from "SD Card" to "Internal storage"
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
Bug 1048543 - [Vertical Homescreen] Defer saving of grid until after initial render r=Cwiiis
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
Merge pull request #22497 from KevinGrandon/bug_1048543_homescreen_defer_save

Bug 1048543 - [Vertical Homescreen] Defer saving of grid until after initial render
Bug 1066354 - Fix migration to use new promise instead of callback
Bug 1066363 - disable browser_chrome_bookmark_web_result_test.js