Merge "MTP: Close and reopen driver file after an error." into honeycomb