Use preventDefault instead of stopPropagation

Change-Id: I9c2da14b94348cec39e6a9a1571b22de39e437f0
Merge "Use preventDefault instead of stopPropagation"