am 3ed802de: Merge "Fixing NPE in LauncherModel (Bug 6449627)" into jb-dev

* commit '3ed802de77e9847b45074f206a4ac310257f894e':
  Fixing NPE in LauncherModel (Bug 6449627)