Merge "Update workaround for background widget loading" into main