am 77540341: am 09d12192: am 7cb06bde: am 87f445c8: am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf

* commit '77540341dc893157e01a64e4063c21a19309dec7':