Merge "Allow widgets to be reconfigured" into main