Bug 825327 - Don't mess with the navBar after we've started the tutorial.
[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...
Auto-merge from branch 'master'