Merge "Fix bug with display lists and layout." into honeycomb