Merge "Fix display list support for shapes." into honeycomb