Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev