Merge "Fix for crash when layoutNodeWrappers are reused" into snap-temp-L22200000951599140