Merge "Rename and simplify DisplayList Canvas classes"