Merge "Prevent widgets from entering split" into main