Merge "Fix app links verification resetting user state" into tm-dev