Merge "Dismiss dream when activities are started while dreaming." into tm-dev