Merge "Fix zygote handling of when secondary image is out of date."