am 7716b400: Merge "Fix crash when launcher dies while configuring a widget / shortcut" into ub-now-nova

* commit '7716b400654bae009188daf9053b68727410a53d':
  Fix crash when launcher dies while configuring a widget / shortcut