Merge "Don't crash if default supervision profile owner is not set" into sc-dev