72f7b98742
(cherry picked from commit 6fc1f4fc21)
# Conflicts:
# i18n/src/main/res/values/strings.xml
(cherry picked from commit 6fc1f4fc21)
# Conflicts:
# i18n/src/main/res/values/strings.xml