Merge "Fix flickering when adding a new widget" into main