Bug 964928 nightly firstrun

DO NOT MERGE YET (please)