Merge "Unify manual and programmatic key installation flows"