Merge "Made LocalFile::loadExtraFromDB() handle re-upload race conditions"