Clean up more v1 artifacts.
Clean up row layouts to match mockups and be internally consistent.
Don't show zero-value story counters.
Merge remote-tracking branch 'upstream/master'
Change folder row borders to match mockups.
Merge pull request #276 from ojiikun/master

Android: More Redesign Cleanup