8717c30498
(cherry picked from commit 1a8155c45b)
# Conflicts:
# app/src/main/res/values/strings.xml
(cherry picked from commit 1a8155c45b)
# Conflicts:
# app/src/main/res/values/strings.xml