Merge "DisplayList lifecycle fixes"