am e5db9b9d: am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf

* commit 'e5db9b9db1734659784c2296eaad22f8c579d2ec':
  Making workspace->overview transition smoother