Merge "Remove DisplayList.h dependency from Canvas.h"