Merge "Finish DreamActivity on creation if it is obsolete" into tm-dev