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

* commit '386728b574d3962916527a54d3f194298dcd4044':