Merge "Support BP retry face auth on SFPS acquired" into 24D1-dev