Merge pull request #8196 from JosJuice/android-applinkactivity-race Android: Fix race condition in AppLinkActivity
