Merge "Test app compat overrides added/removed following package update" into sc-v2-dev