Merge "Keystore needs to be able to call apps" into pi-dev