Merge "Fix ANR which could occur for collection widgets with very large items" into jb-dev