Merge "Fix random widget getting displayed after adding a widget" into main