MR 3: Merge upstream v6.712 changes
Description
This MR contains upstream changes from 67839f3f.
The changes will be split to multiple MRs. More to expect in the future MRs.
No conflicts.
Tests
./gradlew clean assembleDebug test
Issues
https://gitlab.e.foundation/e/os/backlog/-/issues/2739
10 commandments of code reviews
Edited by Fahim Masud Choudhury