remove drawer layout remnants from import key dialogue
display correct primary user id in import dialogue MOSTLY

This is an incomplete fix; due to use of machine readable output, there
is no way to know the primary user id for keys fetched from a key
server.

Pending https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index
fix EditKeyActivity
get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString
split getMasterKeyId for the remaining use cases

Closes #549
Merge pull request #553 from Valodim/split-masterKeyId

Split master key & partial fix for uid order