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