Merge "Fix NPE in AbsListView hotspot management"