Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit