am 84cb0b17: am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev

* commit '84cb0b17e64530a3f8fa7c70d1813b59006b675f':
  Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow