Merge "Defers initialization of preferences." into sc-dev