Merge "Unhide PopupWindow window layout type calls"