Merge "Fix: Plugins implementing LifecycleListener cannot use auto registration"