Merge "5/n: Restore biometric dialog state across configuration changes"