Merge "Remove no thread suspension assert in AddImageSpace"