Merge "Keep PluginManager reference to avoid NPE"