Merge "Simplify DeferredDisplayList construction"