Merge "Automatically remove other owned overrides when package override flag changes" into sc-v2-dev