am 322b0a16: Merge "Protecting more views from (bad) MotionEvents"

* commit '322b0a160d29ddbac35d59655111c8730cadd3e2':
  Protecting more views from (bad) MotionEvents