Merge "Fix anchor overlap handling in ListPopupWindow" into oc-dev