Merge "Clean up dangling bitmaps." into nyc-mr1-dev