Merge "Remove unnecessary invocations of UserDataRepository#getOrCreate()" into main