am ca734ad2: am bca63d4c: am b6341e9e: Fix launcher crash

Merge commit 'ca734ad2387629ff9afcd0d5c991074f8212920f'

* commit 'ca734ad2387629ff9afcd0d5c991074f8212920f':
  Fix launcher crash