Merge "Fix possibility of ScrollView not allowing clicks after a fling"