Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev