Merge change I18e02606 into eclair

* changes:
  fix some aspects of [2258746] native crash in launcher2