Merge "Add flag for the credential selector UI improvement work" into main