Merge "Make DarkIconDispatcher visible to plugins"