Merge "Fix widget dissapearing because of change of appWidgetId" into main