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

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