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

* commit '87f445c8b28c59e787e5fbfc7ba223e112d2263f':
  Only import workspaces for non-tablets (where grid hasn't changed)