Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev