MR 4: Merge upstream v6.712 changes
Description
This MR contains upstream changes from 89f59b0b to a75c7abb.
The changes will be split to multiple MRs. More to expect in the future MRs.
Screenshots
Technical details
Tests
./gradlew clean assembleDebug test
Issues
backlog#2739
10 commandments of code reviews
Edited by Fahim M. Choudhury