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

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