Merge "Revert "Disable per-process app class to investigate"" into tm-dev