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