Merge "Verify app links user selection preservation on update" into sc-v2-dev