Merge "Restore code to draw backdrop and content nodes"