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

Change-Id: I20da3472569c1882f88a56b0e4fd720f75396f7d