Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev