Merge "Fix display List bugs" into honeycomb