Cleanup SelectSecretKeyActivity and also return Uri