Merge "Launcher changes to support custom cling hints." into jb-ub-now-indigo-rose