Merge "Fix race condition between PromptIconViewBinder and BiometricSizeBinder" into main