am 8b5b05b7: Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit

* commit '8b5b05b7f3c8c5d705116c425bd5dbff2b75d56a':
  New launcher2 icon migration algorithm.