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

Change-Id: Ib5b59f780003b30b43219288b4153b20b2db1032