Merge "Only import workspaces for non-tablets (where grid hasn't changed)" into jb-ub-now-jolly-elf