am 91e40e78: Merge change I18e02606 into eclair

Merge commit '91e40e7838d183cb2a9e750edf0a6572f21da21d' into eclair-mr2

* commit '91e40e7838d183cb2a9e750edf0a6572f21da21d':
  fix some aspects of [2258746] native crash in launcher2