Merge "Prevent proguard related crashloop on weather clock" into main