Merge "Fix swipe thresholds not being propagated." into tm-dev