Merge "Improve touch paint sample to use geometrical touch width." into gingerbread