Merge "Fix bitmap meshes to work in display lists." into honeycomb