Merge "Fix another race condition for provider ui launching."