Merge "Add key encryption to KeySyncTask"