Merge "Save KeyChainSnapshots to disk" into pi-dev