Merge "Fix AodNotifIcons overlapping with date view in large weather clock" into main