Merge "Fixing NPE for AppWidgetManagerServiceImpl." into main