Merge "Fix BiometricDialog onConfigChange crash"