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

* commit '515027d322fd58ce8555dd32ffd5309c772a8bfa':
  Minor fixes to Launcher