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