Merge "Fix calculation for swipe margin of error"