Merge "Connnect to widget service only in AppWidgetManager" into main