Merge "Fix null pointer exception when MTP/PTP device is detached." into nyc-dev