am 7e23ffeb: am 351453a1: am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf

* commit '7e23ffebe926a1818e6fae9a4cf4bb047309c099':