Bug 811528 - pref native identity on
Bug 796381 - About should expose IMEI, ICCID, MSISDN
Bug 825327 - Don't mess with the navBar after we've started the tutorial.
Bug 825868 - The APN.json database is forked in the FTU app
Bug 824783 - Don't show the "empty folder" and "loading" indicators at the same time; r=asuth, a=blocking-basecamp
Merge pull request #7245 from mozsquib/email-as-fake-inbox

Bug 824783 - Don't show the "empty folder" and "loading" indicators at the same time
Bug 824099 - don't crash and ignore m4v movies and trash in the music metadata parser r=dkuo a=blocking+
Bug 825615 - scale small videos up to screen size when playing them. r=daleharvey a=blocking+
Bug 822992 - [email] body block size calculations can become incorrect, lead to failure to split body block, breaking synchronization. r=squib, a=blocking-basecamp.
Merge pull request #7274 from asutherland/email-size-calcs

Bug 822992 - [email] body block size calculations can become incorrect, lead to failure to split body block, breaking synchronization. r=squib, a=blocking-basecamp.
Bug 824190 - [email] once attachments are downloaded, the file size shows NaN. r=squib, a=blocking-basecamp
Merge pull request #7275 from asutherland/email-attachment-size-corruption

Bug 824190 - [email] once attachments are downloaded, the file size shows NaN. r=squib, a=blocking-basecamp
Bug 825374 - [email] UI regression on compose card; address input boxes cut off text, appear to resize based on amount of text typed in them.

Also includes a fix for the lack of a comma key with type=email
https://bugzilla.mozilla.org/show_bug.cgi?id=825812
Bug 824615 - Multiple activities
Bug 825798 - Automatically shutdown when battery is too low, r=timdream,
    a=blocking-basecamp
Merge pull request #7281 from vingtetun/825868

Bug 825868 - The APN.json database is forked in the FTU app
Merge pull request #7277 from alivedise/bugzilla/825798/automatic-shutdown-low-battery

Bug 825798 - Automatically shutdown when battery is too low
Merge pull request #7276 from alivedise/bugzilla/824615/multiple-activity

Bug 824615 - Multiple activities
Bug 825299 - Missing l10n entity in the FTU app, r=stas
Merge pull request #7282 from fabi1cazenave/ftu-l10n-missingEntity

Bug 825299 - Missing l10n entity in the FTU app, r=stas