REL-2105 keychain actions in QPT 

Duplicate PR to get this into release.