Merge "Ensure bitmaps aren't freed while referenced from a display list"