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 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 983172 - Parsing jpeg header information for downsampling the image for thumbnail, r=azasypkin
Bug 1066045 - [v2.2][v2.1] Rapidly tapping record after switching from picture to camera mode will take photo instead of video
Bug 1023259

Fixes the contact number shown incompletely in the contact detail screen of SMS conversion
Bug 1063305 - NFC icon disappear after reboot
Bug 1059233 - [SMS] Opening cropped image attachment returned from gallery might cause error, r=azasypkin
Merge pull request #23945 from RudyLu/keyboard/Bug1065922

Bug 1065922 - Pinyin and Zhuyin layout have duplicate period keys in its alternative char menu.
r=timdream.
Merge pull request #24022 from goutamnair7/Bug-1023259

Bug 1023259 - The contact  detail information is truncated in the contact detail dialog, r=steveck-chung
Bug 1057917 - Remove the blue line in "range input" when selected
Bug 1059106 - [settings] move root panel airplane mode item into panels/root
Merge pull request #23939 from steveck-chung/crop-image-workaround

Bug 1059233 - [SMS] Opening cropped image attachment returned from gallery might cause error, r=azasypkin
Bug 1047837 - Codify the concept of layout and layout page
Merge pull request #23936 from timdream/keyboard-page-target

Bug 1047837 - Codify the concept of layout v.s. layout page, r=rudyl, r=zac, f=mnjul