Merge "Add face help message deferral logic to BiometricMessageInteractor" into main