Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev