Merge "Revert "Synchronize selected item data on-demand after data set invalidation"" into mnc-dev