Cleanup FoldableLinearLayout
Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696