Merge "Don't lose interrupt in lockFile()"