Merge "Fixing PendingWidgets getting attached to real host" into main