Merge "Protect against invalid authority in account sync pref." into pi-dev