Merge "Ensure main user is not null before registering settings observer" into main