Merge \"ImageReader: Make close thread safe\" into nyc-mr1-dev
am: 2f8bf1f024

Change-Id: I9954f6b7b7ab997391acbe3f16cbce36d9c5de3c