Merge "Add KeySyncTask"