Merge "Fix bug 5399568 - ListView check states inconsistent after data set change"