Merge "Add test for preserving app links selection on re-verify" into tm-dev