Merge "Fixing NPE in LauncherModel (Bug 6449627)" into jb-dev