08d11914af
(cherry picked from commit 159146e197)
# Conflicts:
# app/build.gradle
# build.gradle.kts
(cherry picked from commit 159146e197)
# Conflicts:
# app/build.gradle
# build.gradle.kts