Merge "Skip populating default widgets after a restore" into main