Merge "Add runtime flag to zygote" into main