Merge "Improve UI pref when sync/cancel account syncs."