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