Merge "Update listener instead of creating a new one"