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