Merge commit '91e40e78' into eclair-mr2 * commit '91e40e78': fix some aspects of [2258746] native crash in launcher2