Merge "Revert "Freeze all package processes before killing"" into tm-dev