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