matrix-react-sdk

Fix multiple issues with account merging

#2313

Merged