am 33ed7b2f: Fix some crashes in launcher2.

Merge commit '33ed7b2f5a2456dc44dfe6e8f35a415c1495a87c'

* commit '33ed7b2f5a2456dc44dfe6e8f35a415c1495a87c':
  Fix some crashes in launcher2.