3b87111f22
(cherry picked from commit ba67781431)
# Conflicts:
# app/src/main/res/values/strings.xml
(cherry picked from commit ba67781431)
# Conflicts:
# app/src/main/res/values/strings.xml