Merge "Avoid showing the scanning animation when face auth succeeds" into main