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 '09d121923b0673605f95e6b178a7b8fff27551d8':
  Only import workspaces for non-tablets (where grid hasn't changed)