Merge "Fix flaky null pointer in LauncherWidgetHolder" into udc-dev