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

Change-Id: I931f0317d495e6bc971f1ac4fc02ea0c20b19cf3