50696bc580
(cherry picked from commit 4e633b8936)
# Conflicts:
# app/src/main/res/drawable/ic_chevron_right_white_24dp.xml
# app/src/main/res/drawable/ic_expand_more_white_24dp.xml