Incorporate https://github.com/matrix-org/matrix-js-sdk/pull/1720
Incorporate https://github.com/matrix-org/matrix-js-sdk/pull/1720


matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk