Merge "Prevent user stop of protected apps" into tm-dev