Merge "Object-based DisplayList recording"