Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev