Merge "Change drawing in TTV to use Views rather than Canvas" into main