Merge "Revert "Fix there's no padding between time and date in large weather clock in AOD"" into main