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

Change-Id: I77b78cb14e3cb7df901f8dd077c5c91faa21cf16