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

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