am 4e6e0ace: am 1a7cfd67: Merge "Fix for the clearing of fling events" into jb-mr1-aah-dev

* commit '4e6e0ace3309d74b582e2d18e7df5e788beeb5da':
  Fix for the clearing of fling events