Merge "Add gesture touch counts" into qt-r1-dev am: 8607680ee7
am: 5f70f7b861

Change-Id: I7922f26b0a2ce799f0b65a8f007d72abb589e7f1