Merge "Fix ListView being too eager too scroll" into mnc-dev