Merge "Rename RecoveryController.getRecoveryData() to getKeyChainSnapshot."