
(cherry picked from commit fc1c804bfda1d76c0399bbb6214e75b3def951cc) # Conflicts: # app/build.gradle.kts # build.gradle.kts # i18n/build.gradle.kts
(cherry picked from commit fc1c804bfda1d76c0399bbb6214e75b3def951cc) # Conflicts: # app/build.gradle.kts # build.gradle.kts # i18n/build.gradle.kts