am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom

* commit '79aa40302b643ee6c6227ee354a1b1378e721568':
  Can't stop the fling! Bug: 5335420