Bug 1035265 - Follow-up for Nightly firstrun redesign
Merge pull request #2143 from TheoChevalier/bug-1035265-nightly-firstrun-followup

Bug 1035265 - Follow-up for Nightly firstrun redesign