Merge "Fix crash when removing draw listener"