Merge "MTP: Throw a NullPointerException if client is null in MtpCursor constructor"