Merge "Remove deprecated scenario img_dir option"