Merge "Fix image layout in pipeline barrier tests"