Merge "Revert^2 "Support touchpad gesture properties in IDC files"" into udc-dev