Merge "Clear reference to DreamActivity window." into tm-dev