Merge "Do not kill process on removing task if it has a started service" into main