Also make sure to properly dispose *both* ends of the drag input channel when we're done. That was being tidied up after, but was also making the system work harder and was provoking a bit of debug logging. Change-Id: I1ff3100bc4c441f1609c57242864d5744ff1aaa2