This is a patch from upstream which needs to be reworked to be mergable. However, it does improve the situation a lot, fixing crashes and causing gnome-control-center to not lock up completely.
