Merge "ITS: Use TEST_IMG_DIR" into sc-dev