Merge "Fix leak in reused display lists" into honeycomb