Merge "Ensure we render once more when any node property or the node hierarchy change...