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

* commit '664552d8816925f6c77e64742913b3aa81d41ddc':