Merge "media.c2 client: fix # of queried param count" into main