d0e6297995
(cherry picked from commit ef918078d1)
# Conflicts:
# app/build.gradle.kts
(cherry picked from commit ef918078d1)
# Conflicts:
# app/build.gradle.kts