am cfcc1f9d: am 07f920ed: Merge "Fix issue 5639994: disabled multi-touch on folders" into ics-mr1

* commit 'cfcc1f9da71fe0503e6911d1bf910ea464886926':
  Fix issue 5639994: disabled multi-touch on folders