Merge "Just drop the default WP bitmap, don't explicitly recycle it" into pi-dev
am: 018166c16e

Change-Id: If56a713c4c8032fbf4cd0707715d6952ba641ee4