Merge "When destroying layer, add children to offscreen layers"