Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev