am 6844a742: Merge "Fix NPE in ListPopupWindow when ListView has null selector" into lmp-mr1-ub-dev

* commit '6844a742e592b1a9c11bd1b52058ff6c1b917f0d':
  Fix NPE in ListPopupWindow when ListView has null selector