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