Merge "Added ViewConfiguration.getScaledPagingTouchSlop()"