am 0fe41883: am 0e4a365e: Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox

* commit '0fe418832ad2f2df4e80051076e205a5283c1424':
  use restored icon for restored app shortcuts