prevent cancel dring consolidate, move logic into progressable
Merge branch 'development' of github.com:open-keychain/open-keychain into development