Merge "Fix WidgetsListContentEntryTest static initialization error" into sc-dev