d2: re-enable Trebuchet overlays

config_workspaceRows and config_workspaceColumns are now
default_cell_count_y and default_cell_count_x respectively

Change-Id: I75e3b8dc93f1b652cf2fc6b027479ccdb310eecb
Merge "d2: re-enable Trebuchet overlays" into cm-10.1