Merge "Tweaks to launcher layout on Nakasi" into jb-dev