Merge "Fix janky scrolling for Gestures Settings." into nyc-mr1-dev