Merge change I793a35a9 into eclair

* changes:
  ADT now launches app as if launched from launcher.