Merge "Migrate sysui swipe event logging flag to bugfix" into main