Fix/Improvement: add touch cancel event on item + code cleanup

PS2: code cleanup
PS3: updated commit message

Signed-off-by: Parthipan Ramesh <parthipan.ramesh@gmail.com>
Change-Id: I25b6c2d260aa66a18d856f1a069df4c7ac999629