Merge "Fixed a leak of preDrawlisteners when an icon was animating when detached" into pi-dev