Merge "LayoutLib: Delegate for Display and IWindowManager implementation."