Merge "Improve DisplayList state output" into lmp-mr1-dev