Merge "MTP: CPU usage high while under MTP mode."