Merge "Add recovery flow utils to KeySyncUtils"