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

* commit 'ba7fe381ed2c348f6caed1f02b421889baf265a6':