am 67c251bb: am ec437d0e: Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev

* commit '67c251bb26c7f1cdb89550ad805c4e521315e2a8':
  Fix bug 7288630: Folder icons clipped on manta