Stop event propagation after click events

Change-Id: Ife7f3f80cce343c0473a24bb0042cb835a1fc090
Merge "Stop event propagation after click events"