Merge "Allow background default container service in a less crashy way" into oc-dev