Merge "ImageReader: Make close thread safe" into nyc-mr1-dev