Merge "LayoutLib: Fix native delegate for Display."