Merge "Fix ImageReader onImageAvailable synchronization" into klp-dev