link Choice onClick to checkbox Toggle so that click is registered

fix merge linker error
merged upstream changes
Merge pull request #4332 from bollu/clickEntireButton

fix checkbox bug in touch control visibility screen