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

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