Merge "STL improve Swipe definition API 1/2" into main