Merge "Fix a bug with deferred position scrolling in lists while data changes are pending" into jb-dev