Merge "Close MTP database when MtpServer's thread is terminated." into nyc-dev