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

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