Merge "Fix back navigation in biometric enrollment." into sc-dev