Merge "Icon for multi credentials same provider screen" into main