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

Change-Id: Ic676f1eee8a044f5fe0d806cc81720b88a66faf1