am 8e1f9187: Merge "Switch DisplayListData to a staging model"

* commit '8e1f918738abf70a4dc86dbb12b386a9deea37f8':
  Switch DisplayListData to a staging model