Merge "[Settings] Update EID in background"