Merge "Guard against callbacks when no list view created" into mnc-dev