Merge "Fix measurement issues with Spinner and ListPopupWindow"