Merge "Updating launcher icon to fix alignment. Bug:  6511716" into jb-dev