Merge "Tweak some RenderNode API surfaces"