Merge "[automerger skipped] Persist widget size options am: 3f11503975 -s ours" into main