am 21116068: Merge "Ignore generic motion events if custom content doesn\'t allow scrolling" into ub-now-porkchop

* commit '2111606845bec8b40e8eb164c73c60f59c028014':
  Ignore generic motion events if custom content doesn't allow scrolling