Comment 13 for bug 1232419

@Tim: could you detail a bit the changes you did? Some of those seem like unrequired or upstreamable (e.g moving the unwatch calls before stop_fontconfig_monitor() or the "if (manager->priv->managers == NULL) return"