Merge "Don't send PLUGIN_CHANGED broadcast unless something changed"