Merge "ImageReader: Add discardFreeBuffers method" into nyc-mr1-dev