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

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