Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf