
(cherry picked from commit 162b6397050e1577c113a88e7b7cfe9f98e6a45c) # Conflicts: # app/src/main/res/values-sw720dp/dimens.xml
(cherry picked from commit 162b6397050e1577c113a88e7b7cfe9f98e6a45c) # Conflicts: # app/src/main/res/values-sw720dp/dimens.xml