Merge "Revert "SFPS indicator and BiometricPrompt MVVM cleanup"" into main