Merge "Improve tests for checking deeplink presence in preferences" into main