Merge "ImageReader: Increase timeout for waitForNextImage" into klp-dev