Merge "Fix zygote space and non moving space map names"