Merge "UI fixes to align locked provider chip with mocks, handle empty credential type display names, and handle empty credential lists" into main