Merge "Use correct style for GTalk-IM; fixes the height of the secondary icon"