Merge "Don't use saved list state if the app hasn't been killed" into ics-mr1