Merge "Fix bug in creation of EffectHandle when out of memory"