Merge "More work on issue #36891897: Need to ensure foreground..." into oc-dev