Merge "Fix race condition between provider ui launching and credman ui update."