Merge "Support BP retry face auth on SFPS acquired" into main