Merge "Make the STL demo swipe sources closer to Flexi ones (1/2)" into main