bit more launcher2 stuff

Change-Id: Iaa2feaa9a9768b546b42e9bf97897f04f77fddec
Merge "bit more launcher2 stuff" into jb42