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