am edaa3a87: am 386728b5: am 0f45c898: am 136c1763: Merge "backup launcher icons" into jb-ub-now-indigo-rose

* commit 'edaa3a87896ff6ad806d3b804f519f24f5d192fd':