Merge "Use APIs to determine shortcut icon size" into honeycomb