Merge "Simulator: add the argument to keep the updated images"