Fix overlapping unread and name in drawer

For both folders and accounts, there were issues
with overlapping views and layout. Had to revert
back to a 2-deep heirarchy for the folder and
account item views.

Bug: 8765425 Overlapping unread counts and account name
Change-Id: I9e791cd7b4ce36e70032dcf9900df47121ac2a98
3 files changed