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

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