Merge "media: Fix ImageReader only using maxImages=1 no matter what" into klp-dev