Merge changes I036d0251,I7723dcba

* changes:
  TouchpadInputMapper: add dump method
  TouchpadInputMapper: Add gesture property provider