Bug 1035265 - Follow-up for Nightly firstrun redesign