Merge "Fix an initialization ordering bug due to the userprofile changes."