Merge "Fix issue #62196301: Pre-O background restrictions allow starts..." into oc-dev