cannot show more than 15 photos when aggregated by Photos

Regression.

The photos aggregator allows the user to set the number of photos (cardinality) to display from each child scope. facebook photos now cannot show more than 15 photos.

I suppose it is because "count" stops iteration due to this new code query.cpp

    if (metadata_.is_aggregated()) {
        QMapIterator<std::string, std::string> iter(albumList_);
        int count = 0;
        while(iter.hasNext() && count < 6) {
            iter.next();
            QList<api::Photo> photoList = client_->getAllPhotos(iter.key());

            Q_FOREACH(const auto& photo, photoList) {
                if (push_photo_item(reply, iter.value(), photo, has_types))
                    count++;
            }
        }
        return;
    }