Merge "Fixing DST icon for ICS." into jb-mr2-dev