Merge "Wait for initial sync in Welcome."