Merge "Bug 4903178 Restore priority and cgroup on stop"