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

* commit 'e54164d8e781025dec8910c91aba55a7872ccb53':