Merge "Add test for LauncherWidgetHolder" into main