Merge "Persist KeyChainSnapshot to XML" into pi-dev