Merge "Ensure that dreams show while docked." into jb-mr1-dev