Merge "Don't animate large clock appearance on AOD" into sc-dev