Merge "Integrate from support lib: fix restore of list state."