Merge "KeyChain: Unify manual and programmatic key installation flows"