am f5548455: am a1e8ff8c: am bb2c462e: am f8eb28cd: am 6957a8d7: am 044db335: Merge "Making sure overview mode can\'t get stuck (issue 11022017)" into jb-ub-now-indigo-rose

* commit 'f5548455bb7d6ea4ea51bdafb6698764782766e0':