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 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 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
Merge pull request #7199 from fabi1cazenave/settings-imei

Bug 796381 - About should expose IMEI, ICCID, MSISDN, r=timdream, a=21
Bug 825862 - Add loading overlay to sim import during FTU.

Updated: Now disables the navbar during import.
Merge pull request #7273 from davidflanagan/bug825615

Bug 825615 - scale small videos up to screen size when playing them. r=daleharvey a=blocking+
Merge pull request #7271 from davidflanagan/bug824099

Bug 824099 - don't crash and ignore m4v movies and trash in the music metadata parser r=dkuo a=blocking+
[Bug 816243] Adjust max-width calculation for awesomescreen tabs. r=vingtetun
Merge pull request #7283 from leibovic/overflow

[Bug 816243] Adjust max-width calculation for awesomescreen tabs. r=vingtetun a=bb+
Merge pull request #7284 from mrbkap/825327-ftu-error-last-step

Bug 825327 - Don't mess with the navBar after we've started the tutorial...