Merge "Set the listeners to null on unregister" into main