Merge "Remove DefaultContainerService and its references." into qt-dev