am d94533d0: Fix possible NPE in Launcher.

Merge commit 'd94533d04a5f8f5485f106d10af60169857ea899'

* commit 'd94533d04a5f8f5485f106d10af60169857ea899':
  Fix possible NPE in Launcher.