
(cherry picked from commit ee26d6dffd8c77115683ea242c3ab729c70f7ea6) # Conflicts: # app/src/main/res/drawable/ic_tachi.xml # presentation-core/src/main/res/values/colors.xml
(cherry picked from commit ee26d6dffd8c77115683ea242c3ab729c70f7ea6) # Conflicts: # app/src/main/res/drawable/ic_tachi.xml # presentation-core/src/main/res/values/colors.xml