Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev