Merge "Fix race condition for image test"