am 52c8860c: am d8a11572: am 38ed22eb: 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 '52c8860c979ed8da3efd1bc5215e3ab0ffa39f11':