Merge "Introduce disableSwipesWhenScrolling()" into main