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