matrix-react-sdk

Part 2 of 3: Merge develop->experimental minus #2336

#2399

Merged