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

* commit '5def50da0de624abeafafe71dc72b4baf423b985':
  Fallback to default dream if the current dream is removed.