Merge "Fix issue 5639994: disabled multi-touch on folders" into ics-mr1