Merge "ImageReader: disable NV21 support" into klp-dev