8c7a2c4262
(cherry picked from commit 436253dd63)
# Conflicts:
# app/src/main/res/values/strings.xml
(cherry picked from commit 436253dd63)
# Conflicts:
# app/src/main/res/values/strings.xml