1df1a331dd
(cherry picked from commit f312936629)
# Conflicts:
# app/build.gradle.kts
# build.gradle.kts
# settings.gradle.kts