Merge "ImageReader: get correct crop size" into klp-dev