Merge "Fix ImmutableNodes.containerNode()"