am 216777e3: Merge "Use APIs to determine shortcut icon size" into honeycomb

* commit '216777e3ee434ebf4abb039f72dde2d5c26149ef':
  Use APIs to determine shortcut icon size