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

* commit 'ae9940a1597a6818a6252495f6d394824d196db0':
  Minor fixes to Launcher