am 9710ec9d: am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf

* commit '9710ec9d85566ea1edf973f3d51dda24f64bdaaf':
  Fix NPE in case where workspace is null because Launcher has been destroyed