Merge "Add a resource config to define a default supervision component." into qt-dev