Merge "More UX polish Bug: 323607982 Test: Unit tests, Manual See go/credential-selector-ui" into main