Merge "7" launcher changes." into jb-dev