
(cherry picked from commit b8a98ef5e461ad409e723aa313a8cc109765e311) # Conflicts: # .github/readme-images/screens.png # app/build.gradle
(cherry picked from commit b8a98ef5e461ad409e723aa313a8cc109765e311) # Conflicts: # .github/readme-images/screens.png # app/build.gradle