Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev
am: 1c70ecb455

Change-Id: Ia10cec1f06051620b39869265ad386a63b5434e9