Merge "Switch DisplayListData to a staging model"