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