Merge "Fixed silly unlock bug in LocalFile"