Fix memory leak

Event handlers need to be deregistered from the Contoller, especiall
when the event handler is an Activity instance.  With out doing this,
the controller will keep a ref to the activity.  This will prevent
the Activity from being finalized

Bug: 5409478
Change-Id: If3f935c29122fd1b1cf5ef301598fb1ecd73717f