Merge "Passkey key screen string fix." into main