[master] Save our DBus world (possible Alpha blocker fix)