am 601cac2f: Merge "Minor fixes to Launcher" into ics-mr1

* commit '601cac2f3e2f3ce13d8e2e07dbe51945686044eb':
  Minor fixes to Launcher