Bug 931801 - Make shared pref sync code 2-way. r=jimm