Merge "remove overrides of onDrawText -- no longer called"