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

* commit '49cc9cb85376bad11611966fcdbe58dae1ab7a56':
  Fallback to default dream if the current dream is removed.