Merge "Fix FOUC on preferences."