Merge "Add onTerminate runner to MtpServer."