Merge "Move zygote start after loading persist properties"