Fix some serious pre draw listener leaks

These were responsible for a huuge memory leak, and probably also
responsible for some significant amount of jank when using the
device for a while.

Bug: 26400906
Change-Id: Ie4140998ad288583c6a4137954fab4fe9a6f2cf7