cec05194eb
(cherry picked from commit 67128937ca)
# Conflicts:
# app/build.gradle.kts
(cherry picked from commit 67128937ca)
# Conflicts:
# app/build.gradle.kts