Merge "Ensure AbsListView's drawable state reflects its actual state"