Merge "Revert "Make DreamActivity no history"" into tm-qpr-dev