Bug 980549 - Fix various races in settings and contacts, r=gwagner.

--HG--
extra : transplant_source : a%5E%3D%1BD%99%FB%20%9B7%A6%94%5C%29q%3C%ECv%D4%E4