Merge "Add flag for visual interruptions refactor" into main