Merge "Add removeListener, update tests, hide binder"