Merge "Revert "Reduce CascadingMenuPopup's reliance on internal ListView state""