Rebase against Element Android v1.6.12

[yostyle]

Type of change

• [ ] Feature
• [ ] Bugfix
• [ ] Technical
• [x] Other :

Content

Motivation and context

Screenshots / GIFs

Tests

• Step 1
• Step 2
• Step ...

Tested devices

• [x] Physical
• [ ] Emulator
• OS version(s):

Checklist

• [ ] Changes has been tested on an Android device or Android emulator with API 21
• [ ] UI change has been tested on both light and dark themes
• [ ] Accessibility has been taken into account. See https://github.com/tchapgouv/tchap-android/blob/develop/CONTRIBUTING.md#accessibility
• [x] Pull request is based on the develop branch
• [ ] Pull request includes a new file under ./changelog.d. See https://github.com/tchapgouv/tchap-android/blob/develop/CONTRIBUTING.md#changelog
• [ ] Pull request includes screenshots or videos if containing UI changes
• [ ] Pull request includes a sign off
• [x] You've made a self review of your PR
• [ ] If you have modified the screen flow, or added new screens to the application, you have updated the test UiAllScreensSanityTest.allScreensTest()

[tchap-danger-bot[bot]]

	Warnings
:warning:	Please add a changelog. See instructions [here](https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#changelog)
:warning:	You seem to have made changes to views. Please consider adding screenshots.

Generated by :no_entry_sign: dangerJS against 2ed9000d26e15d61db5b6402b200f5d2fb3484aa

[tchap-danger-bot[bot]]

	Warnings
:warning:	You seem to have made changes to views. Please consider adding screenshots.

Generated by :no_entry_sign: dangerJS against aa1701c1f15db837f6c4085cefba15a849714c21

[tchap-danger-bot[bot]]

	Warnings
:warning:	You seem to have made changes to views. Please consider adding screenshots.
:warning:	Please add a reviewer to your PR.

Generated by :no_entry_sign: dangerJS against 7dfcf75d73b9d27d6fc77969fc5028cd9f5733ca