Merge "Fix preserving app links user selection on package update" into sc-v2-dev