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