Merge "Fix NPE crash when BP fallback to credentialUI and rotate" into 24D1-dev