Merge "Clean up foreground service manager controllers"