Merge "Fix issue that widgets with config activity jump" into main