Merge "ImageReader: Fix null listener case" into klp-dev