584bf7dc13
Fixes #8530
(cherry picked from commit 9da232dcd8)
# Conflicts:
# i18n/src/main/res/values/strings.xml