Merge "Make sure `isNonStrongBiometricAllowed` value is correct after reboot" into udc-qpr-dev