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