Merge "Add STATE_CLEAR and STATE_TOUCH_INTERACTING to TouchExplorer."