Merge "Fixing bug 4998211, widgets with configuration not dropping in correct spot"