Fix some serious pre draw listener leaks
am: 38b5ec9

* commit '38b5ec9f081e60e860dcd7a7701d20ce06261133':
  Fix some serious pre draw listener leaks

Change-Id: Icf3cec347126b6541b71a76bfd263a41cb59bf56