Merge "Remove unused functions and variables from DisplayListCanvas"