Merge "[Trackpad] Do not reverse lockscreen trackpad gestures when reverse scrolling is on" into main