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 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
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 1054121: Update wording and layout of Data Sharing FTU screen. r=sfoster r=Pike
Bug 958041 - [DSDS] When unlock SIM PIN in FTE, due to device hasn't camped on network yet, the next SIM manager page will show "No operator" under the SIM.
Bug 983172 - Parsing jpeg header information for downsampling the image for thumbnail, r=azasypkin
Merge pull request #23872 from marshall/bug1054121_fteAnalyticsString

Bug 1054121: Update wording and layout of Data Sharing FTU screen
Bug 1066045 - [v2.2][v2.1] Rapidly tapping record after switching from picture to camera mode will take photo instead of video
Bug 1063740 - Home screen is shown in landscape mode when canceling out of search app. r=kgrandon
Bug 1066607 - Use the BrowserConfigHelper for new tabs to fix the missing origin issues. r=daleharvey
Bug 1023259

Fixes the contact number shown incompletely in the contact detail screen of SMS conversion
Bug 1061331 - Dont persist meta application-name in browser. r=kgrandon
Bug 1066339 - Use CSS variables for statusbar height r=alive