b426084415
Covers changes in https://github.com/vector-im/element-x-android/pull/1288
Covers changes in https://github.com/vector-im/element-x-android/pull/1288