Merge "Decouple UserDataRepository from ImfLock" into main