0492d501f3
(cherry picked from commit b00e8768dc)
# Conflicts:
# app/src/main/res/values/colors.xml
(cherry picked from commit b00e8768dc)
# Conflicts:
# app/src/main/res/values/colors.xml