Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev