Merge "Revert^2 "Remove temp user creation activity"" into tm-dev