Merge "Preserve widgets on upgrade. Bug #2464545"