Merge "Work on issue #36891897: Need to ensure foreground services can't..." into oc-dev