Merge "DisplayList lifecycle changes"