Merge "Stashing SyncSettings for accounts added aft SUW" into nyc-dev