Merge "Fixing widgets broken during reconfiguration" into main