Merge "Don't allow the negative height of ListPopupWindow" into oc-dev
am: adcb8c8a62

Change-Id: Iaa38eb853169a6b8ca98d59f88116bd70a597838