Merge "Add window layout type calls to PopupWindowCompat"