Merge "Fix smartspace disappearing when changing from small to large weather clock and the switching to other clock" into main