Merge "MTP: Clean up MtpServer initialization and threading:"