and pull in changes from StatusQ master
As part of https://github.com/status-im/StatusQ/issues/781
fixes #6268