Merge "Use newest scrap view in ListView" into oc-dev