Merge "Fix nested prescrolling bug in ScrollView"