Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev