Merge "Swap "foreground service" and "bound foreground service" proc states."