am 3aa7fd14: am acc69908: am 0728206a: Merge "Ensure that dreams show while docked." into jb-mr1-dev

* commit '3aa7fd1434d141cf1671b52b8b7b5ed5e057079b':
  Ensure that dreams show while docked.