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