Merge "Improve KeyChain documentation" into pi-dev